[HVM] Make qemu_advance_timer do something sensible with timers which

aren't currently scheduled.

Signed-off-by: Steven Smith <sos22@cam.ac.uk>

diff --git a/tools/ioemu/vl.c b/tools/ioemu/vl.c
index 8ba9cb781dc6597332d717002b5aeb3433cbd590..1a46cf3a9fc25e02e84d07efaac9040b1a2c40c8 100644 (file)
--- a/tools/ioemu/vl.c
+++ b/tools/ioemu/vl.c
@@ -727,7 +727,7 @@ void qemu_del_timer(QEMUTimer *ts)
 
 void qemu_advance_timer(QEMUTimer *ts, int64_t expire_time)
 {
-    if (ts->expire_time > expire_time)
+    if (ts->expire_time > expire_time || !qemu_timer_pending(ts))
        qemu_mod_timer(ts, expire_time);
 }